home *** CD-ROM | disk | FTP | other *** search
/ Resource Library: Multimedia / Resource Library: Multimedia.iso / utils / sound / players / unix / xtank / xtank1.3f_ < prev    next >
Encoding:
Text File  |  1993-01-31  |  29.7 KB  |  1,045 lines
  1. #
  2. # xtank1.3f sound patches by Mark Boyns
  3. #
  4. # This sound patch to xtank1.3f will only work on Sun workstations
  5. # with sound support.  As far as I know this patch will only work
  6. # with an original xtank1.3f.
  7. #
  8. # Sound in xtank also requires that you have rplay version 2.0.
  9. # The older version of rplay will not work correctly.  If you
  10. # do not have rplay2.0 you can obtain it via anonymous ftp
  11. # at sounds.sdsu.edu.  Sound files can also be obtained at
  12. # sounds.sdsu.edu in the /pub/sounds/xtank directory.
  13. #
  14. # This patch does not really add any new sound features except
  15. # now specific sounds can be turned on/off in the Sounds/list
  16. # file.  The Imakefile in the Src directory expects to find
  17. # rplay.h in /usr/include, Src/Include, or /usr/local/include
  18. # and librplay.a in /usr/local/lib.  If these are in different
  19. # places you will have to edit the Imakefile in Src.
  20. #
  21. # To apply this patch
  22. # % cd your_xtank_directory (the one with Imakefile.Config)
  23. # % patch -p0 < sound-patches >& patchresults
  24. #
  25. # Send problems/question/comments to boyns@sciences.sdsu.edu.
  26. #
  27. # Have fun...
  28. #
  29. # Mark
  30. #
  31. *** /dev/null    Thu Nov 19 10:28:12 1992
  32. --- Sounds/list    Thu Nov 19 10:41:09 1992
  33. ***************
  34. *** 0 ****
  35. --- 1,48 ----
  36. + #
  37. + # This file contains the names of sound files used for sounds.
  38. + # The order of these sounds must correspond to the numbers in
  39. + # $(XTANK_DIR)/Src/Include/Sound.h.  Currenly only the first
  40. + # two strings on each line are read and anything else is ignored.
  41. + # The second string can be either "on" or "off" which will turn
  42. + # that sound on/off during the game.  Yes, I know it would be nice to 
  43. + # be able to turn on/off sounds inside xtank.
  44. + # 
  45. + click1.au        on    # lmg
  46. + click1.au        on    # mg 
  47. + click1.au        on    # hmg 
  48. + click1.au        on    # lrifle 
  49. + click1.au        on    # rifle 
  50. + click1.au        on    # hrifle 
  51. + click1.au        on    # lcannon 
  52. + click1.au        on    # cannon 
  53. + click1.au        on    # hcannon 
  54. + click1.au        on    # lrocket 
  55. + click1.au        on    # rocket 
  56. + click1.au        on    # hrocket 
  57. + click1.au        on    # acid 
  58. + click1.au        on    # flame 
  59. + drip.au        on    # mine 
  60. + Missle1.au        on    # seeker 
  61. + click1.au        on    # slick 
  62. + click1.au        on    # procket 
  63. + click1.au        on    # umissle 
  64. + click1.au        on    # harm 
  65. + click1.au        on    # disc 
  66. + bong.au        on    # vehicle hit wall
  67. + better_boing.au    on    # vehicle hit vehicle
  68. + arrp.au        on    # bullet hit vehicle
  69. + tap2.au        on    # bullet hit wall
  70. + boom.au        on    # tank explosion
  71. + arrp.au        on    # gleam explosion
  72. + arrp.au        on    # dam0 explosion
  73. + arrp.au        on    # dam1 explosion
  74. + arrp.au        on    # dam2 explosion
  75. + arrp.au        on    # dam3 explosion
  76. + arrp.au        on    # dam4 explosion
  77. + arrp.au        on    # exhaust explosion
  78. + arrp.au        on    # electric explosion
  79. + arrp.au        on    # damage explosion
  80. + sub_dive_horn.au    on    # start
  81. + game_over.au        on    # end
  82. + Sonar.au        on    # sonar
  83. + blip.au        on    # blip
  84. *** /dev/null    Thu Nov 19 10:28:12 1992
  85. --- Src/Include/sound.h    Fri Nov 13 11:22:36 1992
  86. ***************
  87. *** 0 ****
  88. --- 1,70 ----
  89. + #ifdef SOUND
  90. + 
  91. + #ifndef    _sound_h
  92. + #define    _sound_h
  93. + 
  94. + /*
  95. +  * This file contains the sound indexes into the sound table
  96. +  * The indexes here must be consistent with those in the file Sounds/list
  97. +  */
  98. + 
  99. + /*
  100. +  * maximum number of sounds
  101. +  */
  102. + #define MAX_SOUNDS            128
  103. + 
  104. + /*
  105. +  * sounds for all the types of weapons
  106. +  */
  107. + #define LMG_SOUND            0
  108. + #define MG_SOUND            1
  109. + #define HMG_SOUND            2
  110. + #define LRIFLE_SOUND            3
  111. + #define RIFLE_SOUND            4
  112. + #define HRIFLE_SOUND            5
  113. + #define LCANNON_SOUND            6
  114. + #define CANNON_SOUND            7
  115. + #define HCANNON_SOUND            8
  116. + #define LROCKET_SOUND            9
  117. + #define ROCKET_SOUND            10
  118. + #define HROCKET_SOUND            11
  119. + #define ACID_SOUND            12
  120. + #define FLAME_SOUND            13
  121. + #define MINE_SOUND            14
  122. + #define SEEKER_SOUND            15
  123. + #define SLICK_SOUND            16
  124. + #define PROCKET_SOUND            17
  125. + #define UMISSLE_SOUND            18
  126. + #define HARM_SOUND            19
  127. + #define DISC_SOUND            20
  128. + /*
  129. +  * things hitting things sounds
  130. +  */
  131. + #define VEHICLE_HIT_WALL_SOUND    21
  132. + #define VEHICLE_HIT_VEHICLE_SOUND    22
  133. + #define BULLET_HIT_VEHICLE_SOUND    23
  134. + #define BULLET_HIT_WALL_SOUND        24
  135. + /*
  136. +  * explosion sounds
  137. +  */
  138. + #define TANK_EXPLOSION_SOUND        25
  139. + #define GLEAM_EXPLOSION_SOUND        26
  140. + #define DAM0_EXPLOSION_SOUND        27
  141. + #define DAM1_EXPLOSION_SOUND        28
  142. + #define DAM2_EXPLOSION_SOUND        29
  143. + #define DAM3_EXPLOSION_SOUND        30
  144. + #define DAM4_EXPLOSION_SOUND        31
  145. + #define EXHAUST_EXPLOSION_SOUND    32
  146. + #define ELECTRIC_EXPLOSION_SOUND    33
  147. + #define DAMAGE_EXPLOSION_SOUND    34
  148. + /*
  149. +  * misc sounds
  150. +  */
  151. + #define START_SOUND            35
  152. + #define END_SOUND            36
  153. + #define SONAR_SOUND            37
  154. + #define BLIP_SOUND            38
  155. + 
  156. + #endif    _sound_h
  157. + 
  158. + #endif SOUND
  159. *** /dev/null    Thu Nov 19 10:28:12 1992
  160. --- Src/sound.c    Thu Nov 19 10:22:42 1992
  161. ***************
  162. *** 0 ****
  163. --- 1,209 ----
  164. + #ifdef SOUND
  165. + #include "limits.h"
  166. + #include "xtank.h"
  167. + #include "graphics.h"
  168. + #include "gr.h"
  169. + #include "xtanklib.h"
  170. + #include "vehicle.h"
  171. + #include "globals.h"
  172. + #include "terminal.h"
  173. + #include "assert.h"
  174. + #include <sys/types.h>
  175. + #include <sys/param.h>
  176. + #include <sys/socket.h>
  177. + #include <netinet/in.h>
  178. + #include <netdb.h>
  179. + #include <stdio.h>
  180. + #include "sound.h"
  181. + #include "rplay.h"
  182. + 
  183. + extern Terminal    *terminal[];
  184. + extern int    num_terminals;
  185. + extern Settings    settings;
  186. + extern char    pathname[], soundsdir[];
  187. + 
  188. + /*
  189. +  * the sound table
  190. +  */
  191. + RPLAY    *sound_table[MAX_SOUNDS];
  192. + 
  193. + /*
  194. +  * create RPLAY packets for all the sounds in Sounds/list
  195. +  */
  196. + init_sounds()
  197. + {
  198. +     char        buf[MAXPATHLEN];
  199. +     char        name[MAXPATHLEN];
  200. +     char        status[32];
  201. +     int        nsounds = 0;
  202. +     FILE        *fp;
  203. + 
  204. +     strcpy(name, pathname);
  205. +     strcat(name, "/");
  206. +     strcat(name, soundsdir);
  207. +     strcat(name, "/");
  208. +     strcat(name, "list");
  209. + 
  210. +     fp = fopen(name, "r");
  211. +     if (fp == NULL) {
  212. +         fprintf(stderr, "Could not open file %s.\n", name);
  213. +         exit(1);
  214. +     }
  215. + 
  216. +     while(fgets(buf, sizeof(buf), fp) != NULL) {
  217. +         switch(buf[0]) {
  218. +         case '#':
  219. +         case '\n':
  220. +         case '\0':
  221. +         case ' ':
  222. +         case '\t':
  223. +             continue;
  224. +         }
  225. +         sscanf(buf, "%s %s", name, status);
  226. +         if (strcmp(status, "on") == 0) {        /* ON */
  227. +             sound_table[nsounds] = rplay_create();
  228. +             if (sound_table[nsounds] == NULL) {
  229. +                 rplay_perror("rplay_create");
  230. +                 exit(1);
  231. +             }
  232. +             if (rplay_set(sound_table[nsounds], RPLAY_PLAY, name, NULL) < 0) {
  233. +                 rplay_perror("rplay_set");
  234. +                 exit(1);
  235. +             }
  236. +         }
  237. +         else if (strcmp(status, "off") == 0) {        /* OFF */
  238. +             sound_table[nsounds] = NULL;
  239. +         }
  240. +         else {
  241. +             fprintf(stderr, "Unknown sound status '%s'.\n", status);
  242. +         }
  243. +         nsounds++;
  244. +     } 
  245. + }
  246. + 
  247. + /*
  248. +  * initialize sound for the given terminal
  249. +  */
  250. + init_terminal_sound(t)
  251. + Terminal    *t;
  252. + {
  253. +     char        *p, *rindex();
  254. +     Video        *vidptr;
  255. +     char        hostname[MAXHOSTNAMELEN];
  256. +     int        i;
  257. + 
  258. +     draw_text_rc(ANIM_WIN, 0, 1, "Initializing Sounds...", M_FONT, WHITE);
  259. +     sync_output(TRUE);
  260. + 
  261. +     /*
  262. +      * get the display hostname 
  263. +      */
  264. +     vidptr = (Video *)t->video;
  265. +     strcat(hostname, vidptr->display_name);
  266. +     p = rindex(hostname, ':');
  267. +     *p = '\0';
  268. +     if (*hostname == '\0') {
  269. +         gethostname(hostname, sizeof(hostname));
  270. +     }
  271. + 
  272. +     /*
  273. +      * initialize rplayd connection
  274. +      */
  275. +     t->rplay_fd = rplay_open(hostname);
  276. +     if (t->rplay_fd < 0) {
  277. +         rplay_perror(hostname);
  278. +         return;
  279. +     }
  280. + 
  281. +     play_terminal(t, SONAR_SOUND);
  282. + }
  283. + 
  284. + /*
  285. +  * play a sound on a terminal
  286. +  */
  287. + play_terminal(t, index)
  288. + Terminal    *t;
  289. + int        index;
  290. + {
  291. +     if (!settings.si.no_sound) {
  292. +         if (t->rplay_fd > 0 && sound_table[index] > 0)
  293. +             rplay(t->rplay_fd, sound_table[index]);
  294. +     }
  295. + }
  296. + 
  297. + /*
  298. +  * play a sound on all terminals
  299. +  */
  300. + play_all(index)
  301. + int    index;
  302. + {
  303. +     if (!settings.si.no_sound) {
  304. +         int    x;
  305. +     
  306. +         for(x = 0; x < num_terminals; x++)
  307. +             if (terminal[x]->rplay_fd > 0 && sound_table[index] != NULL)
  308. +                 rplay(terminal[x]->rplay_fd, sound_table[index]);
  309. +     }
  310. + }
  311. + 
  312. + /*
  313. +  * play a sound on the terminal "owning" or watching this tank
  314. +  */
  315. + play_owner(vehicle, index)
  316. + Vehicle        *vehicle;
  317. + int        index;
  318. + {
  319. +     if (!settings.si.no_sound) {
  320. +         int    x, y;
  321. + 
  322. +         for (x = 0; x < vehicle->owner->num_players; x++) {
  323. +             y = vehicle->owner->player[x];
  324. +             if (terminal[y]->rplay_fd > 0 && sound_table[index] != NULL)
  325. +                 rplay(terminal[y]->rplay_fd, sound_table[index]);
  326. +         }
  327. +     }
  328. + }
  329. + 
  330. + /*
  331. +  * play a sound on the terminal that has this location in view
  332. +  */
  333. + play_in_view(loc, index)
  334. + Loc    *loc;
  335. + int    index;
  336. + {
  337. +     if (!settings.si.no_sound) {
  338. +         int    x, dx, dy;
  339. +         int    t_x = loc->x;
  340. +         int    t_y = loc->y;
  341. + 
  342. +         for (x = 0; x < num_terminals; x++) {
  343. +             dx = t_x - terminal[x]->loc.x;
  344. +             dy = t_y - terminal[x]->loc.y;
  345. +             if (dx >= 0 && dx <= ANIM_WIN_WIDTH && dy >= 0 && dy <= ANIM_WIN_HEIGHT &&
  346. +                 terminal[x]->rplay_fd > 0 && sound_table[index] != NULL)
  347. +                 rplay(terminal[x]->rplay_fd, sound_table[index]);
  348. +         }
  349. +     }
  350. + }
  351. + 
  352. + /*
  353. +  * play a sound on the terminal that has this location in view
  354. +  */
  355. + play_in_view_x_y(t_x, t_y, index)
  356. + int    t_x;
  357. + int    t_y;
  358. + int    index;
  359. + {
  360. +     if (!settings.si.no_sound) {
  361. +         int    x, dx, dy;
  362. + 
  363. +         for (x = 0; x < num_terminals; x++) {
  364. +             dx = t_x - terminal[x]->loc.x;
  365. +             dy = t_y - terminal[x]->loc.y;
  366. +             if (dx >= 0 && dx <= ANIM_WIN_WIDTH && dy >= 0 && dy <= ANIM_WIN_HEIGHT &&
  367. +                 terminal[x]->rplay_fd > 0 && sound_table[index] != NULL)
  368. +                 rplay(terminal[x]->rplay_fd, sound_table[index]);
  369. +         }
  370. +     }
  371. + }
  372. + #endif SOUND
  373. Common subdirectories: ./Bin and ../xtank1.3f-sound/Bin
  374. Common subdirectories: ./Doc and ../xtank1.3f-sound/Doc
  375. Common subdirectories: ./Help and ../xtank1.3f-sound/Help
  376. diff -c -r ./Imakefile.Config ../xtank1.3f-sound/Imakefile.Config
  377. *** ./Imakefile.Config    Sat Sep 12 12:37:30 1992
  378. --- ../xtank1.3f-sound/Imakefile.Config    Fri Nov 13 12:50:24 1992
  379. ***************
  380. *** 173,179 ****
  381.   DEFINES2        = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT \
  382.           -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS \
  383.           -DBATCH_COLOR_LINES \
  384. !         -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES)
  385.   
  386.   DEFINES         = -DXTANK_DIR=\"/src/pub/xtank\" $(DEFINES2) \
  387.           -DALLDEFINES="\"$(DEFINES2)\""
  388. --- 173,180 ----
  389.   DEFINES2        = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT \
  390.           -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS \
  391.           -DBATCH_COLOR_LINES \
  392. !         -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES) \
  393. !         -DSOUND
  394.   
  395.   DEFINES         = -DXTANK_DIR=\"/src/pub/xtank\" $(DEFINES2) \
  396.           -DALLDEFINES="\"$(DEFINES2)\""
  397. Common subdirectories: ./Mazes and ../xtank1.3f-sound/Mazes
  398. Common subdirectories: ./Programs and ../xtank1.3f-sound/Programs
  399. Common subdirectories: ./Src and ../xtank1.3f-sound/Src
  400. Common subdirectories: ./Todo and ../xtank1.3f-sound/Todo
  401. Common subdirectories: ./Util and ../xtank1.3f-sound/Util
  402. Common subdirectories: ./Vehicles and ../xtank1.3f-sound/Vehicles
  403. diff -c -r ./Bin/xtank ../xtank1.3f-sound/Bin/xtank
  404. *** ./Bin/xtank    Sat Feb  1 14:00:59 1992
  405. --- ../xtank1.3f-sound/Bin/xtank    Thu Nov 19 10:25:43 1992
  406. ***************
  407. *** 3,8 ****
  408. --- 3,9 ----
  409.   XTANK_VEHICLES=Vehicles
  410.   XTANK_MAZES=Mazes
  411.   XTANK_PROGRAMS=Programs
  412. + XTANK_SOUNDS=Sounds
  413.   
  414.   #
  415.   # rpotter thinks this is a kludge, I think it is funny! (lidl)
  416. Common subdirectories: ./Doc/Src and ../xtank1.3f-sound/Doc/Src
  417. Common subdirectories: ./Programs/Old and ../xtank1.3f-sound/Programs/Old
  418. Common subdirectories: ./Programs/Old/Old and ../xtank1.3f-sound/Programs/Old/Old
  419. Common subdirectories: ./Src/Fixed-Point and ../xtank1.3f-sound/Src/Fixed-Point
  420. diff -c -r ./Src/Imakefile ../xtank1.3f-sound/Src/Imakefile
  421. *** ./Src/Imakefile    Sat Sep 12 12:36:46 1992
  422. --- ../xtank1.3f-sound/Src/Imakefile    Fri Nov 13 13:14:23 1992
  423. ***************
  424. *** 17,23 ****
  425.                       program.c radar.c repair.c scroll.c setup.c setups.c \
  426.                       status.c sysdep.c thread.c unix.c update.c util.c \
  427.                       vdesign.c vehicle.c players.c newfile.c vload.c \
  428. !                     version.c $(SRCS2)
  429.                OBJS = 3d.o XMultiSync.o actions.o animate.o box.o camo.o \
  430.                       collision.o cosell.o disc.o display.o escher.o \
  431.                       explosion.o file.o game.o gr.o graphics.o highlib.o \
  432. --- 17,23 ----
  433.                       program.c radar.c repair.c scroll.c setup.c setups.c \
  434.                       status.c sysdep.c thread.c unix.c update.c util.c \
  435.                       vdesign.c vehicle.c players.c newfile.c vload.c \
  436. !                     version.c sound.c $(SRCS2)
  437.                OBJS = 3d.o XMultiSync.o actions.o animate.o box.o camo.o \
  438.                       collision.o cosell.o disc.o display.o escher.o \
  439.                       explosion.o file.o game.o gr.o graphics.o highlib.o \
  440. ***************
  441. *** 27,33 ****
  442.                       program.o radar.o repair.o scroll.o setup.o setups.o \
  443.                       status.o sysdep.o thread.o unix.o update.o util.o \
  444.                       vdesign.o vehicle.o players.o newfile.o vload.o \
  445. !                     version.o $(OBJS2)
  446.                INCL = Include/bullet.h Include/common.h Include/cosell.h \
  447.                       Include/disc.h Include/game.h Include/globals.h \
  448.                       Include/gr.h Include/graphics.h Include/icounter.h \
  449. --- 27,33 ----
  450.                       program.o radar.o repair.o scroll.o setup.o setups.o \
  451.                       status.o sysdep.o thread.o unix.o update.o util.o \
  452.                       vdesign.o vehicle.o players.o newfile.o vload.o \
  453. !                     version.o sound.o $(OBJS2)
  454.                INCL = Include/bullet.h Include/common.h Include/cosell.h \
  455.                       Include/disc.h Include/game.h Include/globals.h \
  456.                       Include/gr.h Include/graphics.h Include/icounter.h \
  457. ***************
  458. *** 41,47 ****
  459.                       Include/team.h Include/terminal.h Include/thread.h \
  460.                       Include/tread-defs.h Include/vdesc.h Include/vehicle.h \
  461.                       Include/vehicleparts.h Include/vstructs.h \
  462. !                     Include/weapon-defs.h Include/xtank.h Include/xtanklib.h
  463.               XINCL = Include/x11.h
  464.   
  465.   /**/# Note that both x11.c and mazeconv.c are included in other .c files,
  466. --- 41,48 ----
  467.                       Include/team.h Include/terminal.h Include/thread.h \
  468.                       Include/tread-defs.h Include/vdesc.h Include/vehicle.h \
  469.                       Include/vehicleparts.h Include/vstructs.h \
  470. !                     Include/weapon-defs.h Include/xtank.h Include/xtanklib.h \
  471. !             Include/sound.h
  472.               XINCL = Include/x11.h
  473.   
  474.   /**/# Note that both x11.c and mazeconv.c are included in other .c files,
  475. ***************
  476. *** 49,59 ****
  477.   
  478.   /**/# Important things that Xtank wants to find
  479.   
  480. !    EXTRA_INCLUDES = -I. -IInclude
  481.   
  482.   /**/# Everybody needs the following libraries
  483.   
  484. !   EXTRA_LIBRARIES = -LPrograms -lxtankrobots -lm
  485.   
  486.   /**/# Start of System Dependent Things
  487.   /**/# (e.g. libraries, linker flags and so forth)
  488. --- 50,60 ----
  489.   
  490.   /**/# Important things that Xtank wants to find
  491.   
  492. !    EXTRA_INCLUDES = -I. -IInclude -I/usr/local/include
  493.   
  494.   /**/# Everybody needs the following libraries
  495.   
  496. !   EXTRA_LIBRARIES = -LPrograms -lxtankrobots -lm -L/usr/local/lib -lrplay
  497.   
  498.   /**/# Start of System Dependent Things
  499.   /**/# (e.g. libraries, linker flags and so forth)
  500. Common subdirectories: ./Src/Include and ../xtank1.3f-sound/Src/Include
  501. Common subdirectories: ./Src/Objects and ../xtank1.3f-sound/Src/Objects
  502. Common subdirectories: ./Src/Old and ../xtank1.3f-sound/Src/Old
  503. Common subdirectories: ./Src/Programs and ../xtank1.3f-sound/Src/Programs
  504. diff -c -r ./Src/explosion.c ../xtank1.3f-sound/Src/explosion.c
  505. *** ./Src/explosion.c    Sat Sep 12 12:51:48 1992
  506. --- ../xtank1.3f-sound/Src/explosion.c    Fri Nov 13 11:28:33 1992
  507. ***************
  508. *** 13,18 ****
  509. --- 13,21 ----
  510.   #include "bullet.h"
  511.   #include "graphics.h"
  512.   #include "loc.h"
  513. + #ifdef SOUND
  514. + #include "sound.h"
  515. + #endif SOUND
  516.   
  517.   
  518.   #define EXP_SPREAD 15
  519. ***************
  520. *** 32,37 ****
  521. --- 35,75 ----
  522.   
  523.       if (eset->number >= MAX_EXPS)
  524.       return;
  525. + 
  526. + #ifdef SOUND
  527. +      switch (type) {
  528. +         case EXP_TANK:
  529. +                 play_in_view(loc, TANK_EXPLOSION_SOUND);
  530. +                 break;
  531. +         case EXP_GLEAM:
  532. +                 play_in_view(loc, GLEAM_EXPLOSION_SOUND);
  533. +                 break;
  534. +         case EXP_DAM0:
  535. +                 play_in_view(loc, DAM0_EXPLOSION_SOUND);
  536. +                 break;
  537. +         case EXP_DAM1:
  538. +                 play_in_view(loc, DAM1_EXPLOSION_SOUND);
  539. +                 break;
  540. +         case EXP_DAM2:
  541. +                 play_in_view(loc, DAM2_EXPLOSION_SOUND);
  542. +                 break;
  543. +         case EXP_DAM3:
  544. +                 play_in_view(loc, DAM3_EXPLOSION_SOUND);
  545. +                 break;
  546. +         case EXP_DAM4:
  547. +                 play_in_view(loc, DAM4_EXPLOSION_SOUND);
  548. +                 break;
  549. +         case EXP_EXHAUST:
  550. +                 play_in_view(loc, EXHAUST_EXPLOSION_SOUND);
  551. +                 break;
  552. +         case EXP_ELECTRIC:
  553. +                 play_in_view(loc, ELECTRIC_EXPLOSION_SOUND);
  554. +                 break;
  555. +         default:
  556. +                 play_in_view(loc, DAMAGE_EXPLOSION_SOUND);
  557. +     }
  558. + #endif SOUND
  559. + 
  560.       e = eset->list[eset->number++];
  561.       e->x = (int) loc->x;
  562.       e->y = (int) loc->y;
  563. diff -c -r ./Src/file.c ../xtank1.3f-sound/Src/file.c
  564. *** ./Src/file.c    Sun Sep 13 18:06:56 1992
  565. --- ../xtank1.3f-sound/Src/file.c    Fri Nov 13 13:47:59 1992
  566. ***************
  567. *** 139,144 ****
  568. --- 139,147 ----
  569.   char pathname[MAXPATHLEN];
  570.   char headersdir[MAXPATHLEN];    /* full name of directory to find headers in */
  571.   char vehiclesdir[MAXNAMLEN], mazesdir[MAXNAMLEN], programsdir[MAXNAMLEN];
  572. + #ifdef SOUND
  573. + char soundsdir[MAXNAMLEN];
  574. + #endif SOUND
  575.   char username[MAX_STRING], displayname[256];
  576.   
  577.   #ifdef NEED_AUX_FONT
  578. ***************
  579. *** 187,193 ****
  580.       (void) strcpy(filename, "XVDIR:list");
  581.   #endif /* AMIGA */
  582.   
  583. !     draw_text_rc(ANIM_WIN, 0, 1, "Reading vehicle list...", M_FONT, WHITE);
  584.       sync_output(TRUE);
  585.       if ((file = fopen(filename, "r")) != NULL)
  586.       {
  587. --- 190,196 ----
  588.       (void) strcpy(filename, "XVDIR:list");
  589.   #endif /* AMIGA */
  590.   
  591. !     draw_text_rc(ANIM_WIN, 0, 2, "Reading vehicle list...", M_FONT, WHITE);
  592.       sync_output(TRUE);
  593.       if ((file = fopen(filename, "r")) != NULL)
  594.       {
  595. ***************
  596. *** 215,221 ****
  597.       (void) strcpy(filename, "XMDIR:list");
  598.   #endif /* AMIGA */
  599.   
  600. !     draw_text_rc(ANIM_WIN, 0, 2, "Reading maze list...", M_FONT, WHITE);
  601.       sync_output(TRUE);
  602.       if ((file = fopen(filename, "r")) != NULL)
  603.       {
  604. --- 218,224 ----
  605.       (void) strcpy(filename, "XMDIR:list");
  606.   #endif /* AMIGA */
  607.   
  608. !     draw_text_rc(ANIM_WIN, 0, 3, "Reading maze list...", M_FONT, WHITE);
  609.       sync_output(TRUE);
  610.       if ((file = fopen(filename, "r")) != NULL)
  611.       {
  612. ***************
  613. *** 748,753 ****
  614. --- 751,759 ----
  615.       strcpy(vehiclesdir, (p = getenv("XTANK_VEHICLES")) ? p : "Vehicles");
  616.       strcpy(mazesdir, (p = getenv("XTANK_MAZES")) ? p : "Mazes");
  617.       strcpy(programsdir, (p = getenv("XTANK_PROGRAMS")) ? p : "Programs");
  618. + #ifdef SOUND
  619. +     strcpy(soundsdir, (p = getenv("XTANK_SOUNDS")) ? p : "Sounds");
  620. + #endif SOUND
  621.       if ((p = getenv("XTANK_HEADERS")) != NULL) {
  622.           strcpy(headersdir, p);
  623.       } else {
  624. diff -c -r ./Src/gr.c ../xtank1.3f-sound/Src/gr.c
  625. *** ./Src/gr.c    Sun Aug 30 14:15:11 1992
  626. --- ../xtank1.3f-sound/Src/gr.c    Fri Nov 13 13:02:25 1992
  627. ***************
  628. *** 134,139 ****
  629. --- 134,143 ----
  630.       /* Initialize 3D values for terminal */
  631.       init_terminal_3d(t);
  632.   
  633. + #ifdef SOUND
  634. +     init_terminal_sound(t);
  635. + #endif SOUND
  636. + 
  637.       return 0;
  638.   }
  639.   
  640. ***************
  641. *** 174,179 ****
  642. --- 178,188 ----
  643.   close_terminal(t)
  644.   Terminal *t;
  645.   {
  646. + #ifdef SOUND
  647. +     if (t->rplay_fd > 0) {
  648. +         rplay_close(t->rplay_fd);
  649. +     }
  650. + #endif SOUND
  651.       close_video((Video *) t->video);
  652.       free((char *) t);
  653.   }
  654. diff -c -r ./Src/hit.c ../xtank1.3f-sound/Src/hit.c
  655. *** ./Src/hit.c    Sun Sep 13 00:04:34 1992
  656. --- ../xtank1.3f-sound/Src/hit.c    Fri Nov 13 13:03:58 1992
  657. ***************
  658. *** 66,73 ****
  659.   #include "terminal.h"
  660.   #include "cosell.h"
  661.   #include "globals.h"
  662.   
  663. - 
  664.   extern Map real_map;
  665.   extern Settings settings;
  666.   
  667. --- 66,75 ----
  668.   #include "terminal.h"
  669.   #include "cosell.h"
  670.   #include "globals.h"
  671. + #ifdef SOUND
  672. + #include "sound.h"
  673. + #endif SOUND
  674.   
  675.   extern Map real_map;
  676.   extern Settings settings;
  677.   
  678. ***************
  679. *** 116,121 ****
  680. --- 118,127 ----
  681.       Side side;
  682.       int has_ramplate1, has_ramplate2;
  683.   
  684. + #ifdef SOUND
  685. +     play_in_view(v1->loc, VEHICLE_HIT_VEHICLE_SOUND);
  686. + #endif SOUND
  687. + 
  688.   #ifdef GDEBUG
  689.       int itemp1, itemp2;
  690.       static FILE *statfile = NULL;
  691. ***************
  692. *** 257,262 ****
  693. --- 263,272 ----
  694.       int dx, dy, damage, damage1, damage2;
  695.       int has_ramplate = FALSE;
  696.   
  697. + #ifdef SOUND
  698. +     play_in_view(v->loc, VEHICLE_HIT_WALL_SOUND);
  699. + #endif SOUND
  700. + 
  701.   #ifdef GDEBUG
  702.       int itemp1, itemp2;
  703.       static FILE *statfile = NULL;
  704. ***************
  705. *** 684,689 ****
  706. --- 694,702 ----
  707.       b->flags &= ~wl;
  708.       /* tell all the combatants to update their map */
  709.       invalidate_maps();
  710. + #ifdef SOUND
  711. +     play_in_view_x_y(x, y, TANK_EXPLOSION_SOUND);
  712. + #endif SOUND
  713.       }
  714.   
  715.       return damage;
  716. diff -c -r ./Src/init.c ../xtank1.3f-sound/Src/init.c
  717. *** ./Src/init.c    Sun Aug 30 14:15:12 1992
  718. --- ../xtank1.3f-sound/Src/init.c    Fri Nov 13 11:40:42 1992
  719. ***************
  720. *** 100,105 ****
  721. --- 100,108 ----
  722.           FALSE,        /* Boolean no_nametags */
  723.           TRUE,        /* Boolean team_score GHS */
  724.           FALSE,        /* Boolean no_radar */
  725. + #ifdef SOUND
  726. +         FALSE,        /* Boolean no_sound */
  727. + #endif SOUND
  728.           TRUE,        /* Boolean player_teleport */
  729.           TRUE,        /* Boolean disc_teleport */
  730.           TRUE,        /* Boolean teleport_from_team */
  731. diff -c -r ./Src/interface.c ../xtank1.3f-sound/Src/interface.c
  732. *** ./Src/interface.c    Sat Sep 12 12:51:47 1992
  733. --- ../xtank1.3f-sound/Src/interface.c    Fri Nov 13 11:45:14 1992
  734. ***************
  735. *** 254,259 ****
  736. --- 254,262 ----
  737.               "Ultimate:Own Goal", "Robots don't Win",
  738.               "Scale Armor to Max", "No name tags",
  739.               "Team Scoring", "Disable RADAR",
  740. + #ifdef SOUND
  741. +             "Disable Sound",
  742. + #endif SOUND
  743.               "Players can Teleport", "Discs can Teleport",
  744.               "'port from team", "'port from neutral",
  745.               "'port to team", "'port to neutral",
  746. ***************
  747. *** 357,376 ****
  748.           menu_set_hil(&menu_sys, FLAGS_MENU, 14);
  749.       if (settings.si.no_radar)
  750.           menu_set_hil(&menu_sys, FLAGS_MENU, 15);
  751.       if (settings.si.player_teleport)
  752. -     menu_set_hil(&menu_sys, FLAGS_MENU, 16);
  753. -     if (settings.si.disc_teleport)
  754.       menu_set_hil(&menu_sys, FLAGS_MENU, 17);
  755. !     if (settings.si.teleport_from_team)
  756.       menu_set_hil(&menu_sys, FLAGS_MENU, 18);
  757. !     if (settings.si.teleport_from_neutral)
  758.       menu_set_hil(&menu_sys, FLAGS_MENU, 19);
  759. !     if (settings.si.teleport_to_team)
  760.       menu_set_hil(&menu_sys, FLAGS_MENU, 20);
  761. !     if (settings.si.teleport_to_neutral)
  762.       menu_set_hil(&menu_sys, FLAGS_MENU, 21);
  763. !     if (settings.si.teleport_any_to_any)
  764.       menu_set_hil(&menu_sys, FLAGS_MENU, 22);
  765.   
  766.   }
  767.   
  768. --- 360,383 ----
  769.           menu_set_hil(&menu_sys, FLAGS_MENU, 14);
  770.       if (settings.si.no_radar)
  771.           menu_set_hil(&menu_sys, FLAGS_MENU, 15);
  772. + #ifdef SOUND
  773. +     if (settings.si.no_sound)
  774. +         menu_set_hil(&menu_sys, FLAGS_MENU, 16);
  775. + #endif SOUND
  776.       if (settings.si.player_teleport)
  777.       menu_set_hil(&menu_sys, FLAGS_MENU, 17);
  778. !     if (settings.si.disc_teleport)
  779.       menu_set_hil(&menu_sys, FLAGS_MENU, 18);
  780. !     if (settings.si.teleport_from_team)
  781.       menu_set_hil(&menu_sys, FLAGS_MENU, 19);
  782. !     if (settings.si.teleport_from_neutral)
  783.       menu_set_hil(&menu_sys, FLAGS_MENU, 20);
  784. !     if (settings.si.teleport_to_team)
  785.       menu_set_hil(&menu_sys, FLAGS_MENU, 21);
  786. !     if (settings.si.teleport_to_neutral)
  787.       menu_set_hil(&menu_sys, FLAGS_MENU, 22);
  788. +     if (settings.si.teleport_any_to_any)
  789. +     menu_set_hil(&menu_sys, FLAGS_MENU, 23);
  790.   
  791.   }
  792.   
  793. ***************
  794. *** 937,960 ****
  795.               settings.si.no_radar ^= TRUE;
  796.               break;
  797.           case 16:
  798. !             settings.si.player_teleport ^= TRUE;
  799.               break;
  800.           case 17:
  801. !             settings.si.disc_teleport ^= TRUE;
  802.               break;
  803.           case 18:
  804. !             settings.si.teleport_from_team ^= TRUE;
  805.               break;
  806.           case 19:
  807. !             settings.si.teleport_from_neutral ^= TRUE;
  808.               break;
  809.           case 20:
  810. !             settings.si.teleport_to_team ^= TRUE;
  811.               break;
  812.           case 21:
  813. !             settings.si.teleport_to_neutral ^= TRUE;
  814.               break;
  815.           case 22:
  816.               settings.si.teleport_any_to_any ^= TRUE;
  817.               break;
  818.       }
  819. --- 944,970 ----
  820.               settings.si.no_radar ^= TRUE;
  821.               break;
  822.           case 16:
  823. !             settings.si.no_sound ^= TRUE;
  824.               break;
  825.           case 17:
  826. !             settings.si.player_teleport ^= TRUE;
  827.               break;
  828.           case 18:
  829. !             settings.si.disc_teleport ^= TRUE;
  830.               break;
  831.           case 19:
  832. !             settings.si.teleport_from_team ^= TRUE;
  833.               break;
  834.           case 20:
  835. !             settings.si.teleport_from_neutral ^= TRUE;
  836.               break;
  837.           case 21:
  838. !             settings.si.teleport_to_team ^= TRUE;
  839.               break;
  840.           case 22:
  841. +             settings.si.teleport_to_neutral ^= TRUE;
  842. +             break;
  843. +         case 23:
  844.               settings.si.teleport_any_to_any ^= TRUE;
  845.               break;
  846.       }
  847. diff -c -r ./Src/lowlib.c ../xtank1.3f-sound/Src/lowlib.c
  848. *** ./Src/lowlib.c    Sun Sep 13 00:04:36 1992
  849. --- ../xtank1.3f-sound/Src/lowlib.c    Fri Nov 13 11:49:44 1992
  850. ***************
  851. *** 83,88 ****
  852. --- 83,91 ----
  853.   #include "outpost.h"
  854.   #include "globals.h"
  855.   #include "graphics.h"
  856. + #ifdef SOUND
  857. + #include "sound.h"
  858. + #endif SOUND
  859.   
  860.   extern Weapon_stat weapon_stat[];
  861.   extern Armor_stat armor_stat[];
  862. ***************
  863. *** 694,699 ****
  864. --- 697,769 ----
  865.   
  866.       cv->frame_weapon_fired = frame;
  867.   
  868. + #ifdef SOUND
  869. +         switch(w->type) {
  870. +         case LMG:
  871. +                 play_in_view(cv->loc, LMG_SOUND);
  872. +                 break;
  873. +         case MG:
  874. +                 play_in_view(cv->loc, MG_SOUND);
  875. +                 break;
  876. +         case HMG:
  877. +                 play_in_view(cv->loc, HMG_SOUND);
  878. +                 break;
  879. +         case LRIFLE:
  880. +                 play_in_view(cv->loc, LRIFLE_SOUND);
  881. +                 break;
  882. +         case RIFLE:
  883. +                 play_in_view(cv->loc, RIFLE_SOUND);
  884. +                 break;
  885. +         case HRIFLE:
  886. +                 play_in_view(cv->loc, HRIFLE_SOUND);
  887. +                 break;
  888. +         case LCANNON:
  889. +                 play_in_view(cv->loc, LCANNON_SOUND);
  890. +                 break;
  891. +         case CANNON:
  892. +                 play_in_view(cv->loc, CANNON_SOUND);
  893. +                 break;
  894. +         case HCANNON:
  895. +                 play_in_view(cv->loc, HCANNON_SOUND);
  896. +                 break;
  897. +         case LROCKET:
  898. +                 play_in_view(cv->loc, LROCKET_SOUND);
  899. +                 break;
  900. +         case ROCKET:
  901. +                 play_in_view(cv->loc, ROCKET_SOUND);
  902. +                 break;
  903. +         case HROCKET:
  904. +                 play_in_view(cv->loc, HROCKET_SOUND);
  905. +                 break;
  906. +         case ACID:
  907. +                 play_in_view(cv->loc, ACID_SOUND);
  908. +                 break;
  909. +         case FLAME:
  910. +                 play_in_view(cv->loc, FLAME_SOUND);
  911. +                 break;
  912. +         case MINE:
  913. +                 play_in_view(cv->loc, MINE_SOUND);
  914. +                 break;
  915. +         case SEEKER:
  916. +                 play_in_view(cv->loc, SEEKER_SOUND);
  917. +                 break;
  918. +         case SLICK:
  919. +                 play_in_view(cv->loc, SLICK_SOUND);
  920. +                 break;
  921. +         case PROCKET:
  922. +                 play_in_view(cv->loc, PROCKET_SOUND);
  923. +                 break;
  924. +         case UMISSLE:
  925. +                 play_in_view(cv->loc, UMISSLE_SOUND);
  926. +                 break;
  927. +         case HARM:
  928. +                 play_in_view(cv->loc, HARM_SOUND);
  929. +                 break;
  930. +         case DISC:
  931. +                 play_in_view(cv->loc, DISC_SOUND);
  932. +                 break;
  933. +         }
  934. + #endif SOUND
  935.       }
  936.   
  937.       check_time();
  938. diff -c -r ./Src/main.c ../xtank1.3f-sound/Src/main.c
  939. *** ./Src/main.c    Sat Sep 12 12:51:46 1992
  940. --- ../xtank1.3f-sound/Src/main.c    Fri Nov 13 13:49:19 1992
  941. ***************
  942. *** 286,291 ****
  943. --- 286,294 ----
  944.       init_settings();
  945.       init_threader();
  946.       init_msg_sys();
  947. + #ifdef SOUND
  948. +     init_sounds();
  949. + #endif SOUND
  950.   
  951.       /* Rotate vehicle objects */
  952.       debug("Rotating vehicle objects");
  953. diff -c -r ./Src/radar.c ../xtank1.3f-sound/Src/radar.c
  954. *** ./Src/radar.c    Sun Sep 13 00:04:42 1992
  955. --- ../xtank1.3f-sound/Src/radar.c    Fri Nov 13 11:52:12 1992
  956. ***************
  957. *** 52,57 ****
  958. --- 52,60 ----
  959.   #include "vehicle.h"
  960.   #include "globals.h"
  961.   #include "bullet.h"
  962. + #ifdef SOUND
  963. + #include "sound.h"
  964. + #endif SOUND
  965.   
  966.   extern Map real_map;
  967.   
  968. ***************
  969. *** 212,217 ****
  970. --- 215,223 ----
  971.   
  972.               if (vehicle_flags) {
  973.   #endif /* !NO_CAMO */
  974. + #ifdef SOUND
  975. +         play_owner(v, BLIP_SOUND);
  976. + #endif SOUND
  977.           b = &r->blip[r->num_blips++];
  978.           b->x = grid2map(x) + MAP_BOX_SIZE / 4;
  979.           b->y = grid2map(y) + MAP_BOX_SIZE / 4;
  980. diff -c -r ./Src/setup.c ../xtank1.3f-sound/Src/setup.c
  981. *** ./Src/setup.c    Sun Aug 30 14:15:21 1992
  982. --- ../xtank1.3f-sound/Src/setup.c    Fri Nov 13 11:53:54 1992
  983. ***************
  984. *** 65,70 ****
  985. --- 65,73 ----
  986.   #include "globals.h"
  987.   #include "assert.h"
  988.   #include "bullet.h"
  989. + #ifdef SOUND
  990. + #include "sound.h"
  991. + #endif SOUND
  992.   
  993.   extern Map real_map;
  994.   extern Boolean game_paused;
  995. ***************
  996. *** 296,304 ****
  997. --- 299,315 ----
  998.   
  999.       game_running = True;
  1000.   
  1001. + #ifdef SOUND
  1002. +     play_all(START_SOUND);
  1003. + #endif SOUND
  1004. + 
  1005.       do {
  1006.           status = animate();
  1007.       } while (status == GAME_RUNNING);
  1008. + 
  1009. + #ifdef SOUND
  1010. +     play_all(END_SOUND);
  1011. + #endif SOUND
  1012.   
  1013.       game_running = False;
  1014.   
  1015. diff -c -r ./Src/Include/settings.h ../xtank1.3f-sound/Src/Include/settings.h
  1016. *** ./Src/Include/settings.h    Sun Aug 30 14:15:51 1992
  1017. --- ../xtank1.3f-sound/Src/Include/settings.h    Fri Nov 13 11:22:06 1992
  1018. ***************
  1019. *** 18,23 ****
  1020. --- 18,26 ----
  1021.       Boolean no_nametags;    /* whether vehicles are anonymous */
  1022.       Boolean team_score;        /* whether to use team scoring */
  1023.       Boolean no_radar;        /* turns everyone's radar off */
  1024. + #ifdef SOUND
  1025. +     Boolean no_sound;        /* turns everyone's sound off */
  1026. + #endif SOUND
  1027.       Boolean player_teleport;    /* whether players can teleport */
  1028.       Boolean disc_teleport;    /* whether discs can teleport */
  1029.       Boolean teleport_from_team;        /* whether we can teleport from */
  1030. diff -c -r ./Src/Include/terminal.h ../xtank1.3f-sound/Src/Include/terminal.h
  1031. *** ./Src/Include/terminal.h    Sun Aug 30 14:15:53 1992
  1032. --- ../xtank1.3f-sound/Src/Include/terminal.h    Fri Nov 13 11:20:28 1992
  1033. ***************
  1034. *** 57,62 ****
  1035. --- 57,65 ----
  1036.                      vehicle */
  1037.       int mouse_speed;        /* True if this terminal sets vehicle speed */
  1038.                               /* by mouse clicks */
  1039. + #ifdef SOUND
  1040. +     int      rplay_fd;
  1041. + #endif SOUND
  1042.   } Terminal;
  1043.   
  1044.  
  1045.